Auto merge of #1238 - SimonSapin:patch-2, r=alexcrichton
authorbors <bors@rust-lang.org>
Wed, 28 Jan 2015 22:33:03 +0000 (22:33 +0000)
committerbors <bors@rust-lang.org>
Wed, 28 Jan 2015 22:33:03 +0000 (22:33 +0000)

Trivial merge